Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(gov): fail proposal when implementation not found (backport #17873) #17882

Merged
merged 2 commits into from
Sep 26, 2023
Merged

fix(gov): fail proposal when implementation not found (backport #17873) #17882

merged 2 commits into from
Sep 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 26, 2023

This is an automatic backport of pull request #17873 done by Mergify.
Cherry-pick of 2f7bc22 has failed:

On branch mergify/bp/release/v0.50.x/pr-17873
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit 2f7bc22a5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   x/gov/abci.go
	modified:   x/gov/abci_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@julienrbrt @mergify
fix(gov): fail proposal when implementation not found (#17873)
9ed374d 
(cherry picked from commit 2f7bc22)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner September 26, 2023 11:32
@mergify mergify bot added the conflicts label Sep 26, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) September 26, 2023 11:48
@julienrbrt julienrbrt merged commit ab6a1e6 into release/v0.50.x Sep 26, 2023
45 of 46 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17873 branch September 26, 2023 12:03
@faddat faddat mentioned this pull request Nov 8, 2024
Closed
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@likhita-809 likhita-809 likhita-809 approved these changes

@julienrbrt julienrbrt julienrbrt approved these changes

@samricotta samricotta Awaiting requested review from samricotta

@atheeshp atheeshp Awaiting requested review from atheeshp

Assignees
No one assigned
Labels
C:x/gov
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@julienrbrt @likhita-809